Revision: bazaar--backbuilder--0--patch-14
Archive: aaron.bentley@utoronto.ca--baz
Creator: Aaron Bentley <aaron.bentley@utoronto.ca>
Date: Thu Mar 31 00:30:23 EST 2005
Standard-date: 2005-03-31 05:30:23 GMT
New-files: commands/.arch-ids/upgrade.c.id
    commands/.arch-ids/upgrade.h.id commands/upgrade.c
    commands/upgrade.h
    libarch/.arch-ids/archive-location.c.id
    libarch/.arch-ids/archive-location.h.id
    libarch/.arch-ids/null-project-tree.c.id
    libarch/.arch-ids/null-project-tree.h.id
    libarch/.arch-ids/tla-project-tree.c.id
    libarch/.arch-ids/tla-project-tree.h.id
    libarch/archive-location.c libarch/archive-location.h
    libarch/null-project-tree.c libarch/null-project-tree.h
    libarch/tests/.arch-ids/unit-archives.c.id
    libarch/tests/unit-archives.c
    libarch/tla-project-tree.c libarch/tla-project-tree.h
    tests/.arch-ids/test-upgrade.sh.id
    tests/test-upgrade.sh
Modified-files: PLUGIN/auto baz/Makefile.in
    commands/abrowse.c commands/add-id.c
    commands/ancestry-graph.c commands/ancestry.c
    commands/annotate.c commands/apply-changeset.c
    commands/apply-delta.c commands/archive-fixup.c
    commands/archive-meta-info.c commands/archive-mirror.c
    commands/archive-snapshot.c commands/archive-version.c
    commands/archives.c commands/branch.c
    commands/branches.c commands/cachedrevs.c
    commands/cacherev.c commands/cat-archive-log.c
    commands/categories.c commands/change-archive.c
    commands/changelog.c commands/changeset.c
    commands/cmds.c commands/cmdutils.c commands/cmdutils.h
    commands/commit.c commands/delta.c commands/diff.c
    commands/export.c commands/export.h commands/file-diff.c
    commands/file-find.c commands/get-changeset.c
    commands/get.c commands/grab.c
    commands/id-tagging-method.c commands/id.c
    commands/import-old.c commands/import.c
    commands/import.h commands/inventory.c
    commands/join-branch.c commands/library-add.c
    commands/library-file.c commands/lint.c
    commands/lock-revision.c commands/log.c
    commands/make-archive.c commands/merge.c
    commands/merges.c commands/missing.c
    commands/parse-package-name.c commands/rbrowse.c
    commands/redo.c commands/register-archive.c
    commands/replay.c commands/revisions.c commands/status.c
    commands/switch.c commands/sync-tree.c
    commands/tree-id.c commands/uncacherev.c commands/undo.c
    commands/update.c commands/valid-package-name.c
    commands/versions.c commands/whereis-archive.c
    libarch/ancestry.c libarch/apply-changeset.c
    libarch/archive-mirror.c libarch/archive-pfs.c
    libarch/archive-setup.c libarch/archive-snapshot.c
    libarch/archive.c libarch/archive.h libarch/archives.c
    libarch/archives.h libarch/build-revision.c
    libarch/build-revision.h libarch/cached-archive.c
    libarch/cached-archive.h libarch/cached-inventory.c
    libarch/cached-inventory.h libarch/changelogs.c
    libarch/changelogs.h libarch/changeset-utils.c
    libarch/commit.c libarch/commit.h
    libarch/copy-project-tree.c libarch/copy-project-tree.h
    libarch/debug.h libarch/file-diffs.c
    libarch/file-diffs.h libarch/file-offset-mapper.c
    libarch/hooks.c libarch/hooks.h libarch/import.c
    libarch/import.h libarch/inode-sig.c libarch/inode-sig.h
    libarch/inv-ids.c libarch/inv-ids.h libarch/invent.c
    libarch/invent.h libarch/libraries.c libarch/libraries.h
    libarch/library-txn.c libarch/library-txn.h
    libarch/local-cache.c libarch/local-cache.h
    libarch/make-changeset-files.c
    libarch/make-changeset-files.h libarch/make-changeset.c
    libarch/merge-points.c libarch/merge-three-way.c
    libarch/merge-three-way.h libarch/merge.c
    libarch/merge.h libarch/missing.c libarch/missing.h
    libarch/namespace.c libarch/namespace.h libarch/pfs-fs.c
    libarch/pfs-fs.h libarch/pfs-ftp.c libarch/pfs-ftp.h
    libarch/pfs-signatures.c libarch/pfs-signatures.h
    libarch/pfs.c libarch/pfs.h libarch/pristines.c
    libarch/pristines.h libarch/proj-tree-lint.c
    libarch/proj-tree-lint.h libarch/project-tree.c
    libarch/project-tree.h libarch/replay.c libarch/replay.h
    libarch/tag.c libarch/tests/unit-annotate.c
    libarch/tests/unit-apply-changeset.c
    libarch/tests/unit-inv-ids.c
    libarch/tests/unit-namespace.c
    libarch/tests/unit-patch-id.c
    libarch/tests/unit-patch.c libarch/tests/unit-sftp.c
    libarch/undo.c libarch/undo.h libarch/whats-new.c
    libarch/whats-new.h libawk/associative.h
    libawk/relational.c libawk/relational.h
    libfsutils/copy-file.c libfsutils/copy-file.h
    libfsutils/dir-as-cwd.c libfsutils/dir-as-cwd.h
    libfsutils/dir-listing.c libfsutils/dir-listing.h
    libfsutils/ensure-dir.c libfsutils/ensure-dir.h
    libfsutils/link-target.c libfsutils/link-target.h
    libfsutils/link-tree.c libfsutils/link-tree.h
    libfsutils/same.c libfsutils/same.h
    libfsutils/tmp-files.c libfsutils/tmp-files.h
    libinifile/inifile.c libinifile/inifile.h
    libinifile/tests/unit-inifile.c tests/Makefile.in
    tests/test-archive-creation.sh
    tests/test-archive-registration.sh tests/test-commit.sh
    tests/test-file-diff-baz.sh tests/test-file-diff-tla.sh
    tests/test-framework tests/test-import-baz.sh
    tests/test-import.sh tests/test-log.sh
    tests/test-mirror.sh tests/test-register-archive.sh
    tests/test-signing.sh
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--archive-registration--1.3--base-0
    aaron.bentley@utoronto.ca--baz/bazaar--archive-registration--1.3--patch-1
    aaron.bentley@utoronto.ca--baz/bazaar--archive-registration--1.3--patch-2
    aaron.bentley@utoronto.ca--baz/bazaar--archive-registration--1.3--patch-3
    aaron.bentley@utoronto.ca--baz/bazaar--archive-registration--1.3--patch-4
    aaron.bentley@utoronto.ca--baz/bazaar--backbuilder--0--patch-14
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--base-0
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-1
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-2
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-3
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-4
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-5
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-6
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-7
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-8
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-9
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-10
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-11
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-12
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-13
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-14
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-15
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-16
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-17
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-18
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-19
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--base-0
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-1
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-2
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-3
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-4
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-5
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-6
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-7
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-8
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-9
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-10
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-11
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-12
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-13
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-14
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-15
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-16
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-17
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-18
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-19
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-20
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-21
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-22
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-23
    rob.weir@canonical.com--2005-public/baz--nuke-name--0--patch-24
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--base-0
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-1
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-2
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-3
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-4
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-5
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-6
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-7
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-8
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-9
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-10
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-11
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-12
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-13
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-14
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-15
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-16
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-17
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-18
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-19
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-20
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-21
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-22
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-23
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-24
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-25
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-26
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-27
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-28
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-29
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-30
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-31
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-32
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-33
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-34
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-35
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-36
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-37
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-38
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-39
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-40
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-41
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-42
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-43
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-44
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-45
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-46
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-47
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-48
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-49
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-50
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-51
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-52
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-53
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-54
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-55
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-56
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-57
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-58
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-59
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-60
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-61
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-62
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-63
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-64
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-65
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-66
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-67
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-68
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-69
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-70
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-71
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-72
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-73
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-74
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-75
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-76
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-77
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-78
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-79
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-80
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-81
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-82
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-83
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-84
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-85
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-86
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-87
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-88
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-89
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-90
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-91
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-92
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-93
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-94
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-95
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-96
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-97
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-98
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-99
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-100
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-101
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-102
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-103
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-104
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-105
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-106
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-107
    robert.collins@canonical.com--general/bazaar--archive-registration--1.3--patch-108
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-20
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-21
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-22
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-23
    robert.collins@canonical.com--general/bazaar--easy-gpg--1.3--patch-35
    robert.collins@canonical.com--general/bazaar--ng--1.3--base-0
    robert.collins@canonical.com--general/bazaar--nuke-name--1.3--base-0
    robert.collins@canonical.com--general/bazaar--nuke-name--1.3--patch-1
    thelove@canonical.com/bazaar--devo--1.3--patch-33
    thelove@canonical.com/bazaar--devo--1.3--patch-34
    thelove@canonical.com/bazaar--devo--1.3--patch-35
    thelove@canonical.com/bazaar--devo--1.3--patch-36
    thelove@canonical.com/bazaar--devo--1.3--patch-37
    thelove@canonical.com/bazaar--devo--1.3--patch-38
    thelove@canonical.com/bazaar--devo--1.3--patch-39
    thelove@canonical.com/bazaar--devo--1.3--patch-40
Summary: Dirty Merge (Canonical.com Patch Queue Manager)
Keywords: 

I fixed some of the constification as well as fixing conflicts.

Patches applied:
 * thelove@canonical.com/bazaar--devo--1.3--patch-39
 * More test cases for branch in test-archive-registration.sh
Patches applied:

 * jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-17
   Latest merge from rbcollins

 * jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-18
   tests for branch complete

 * jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-19
   Merge from thelove


 * thelove@canonical.com/bazaar--devo--1.3--patch-40
 * fix whereis-archive --all-locations to not be always on
Patches applied:

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-23
   fix whereis-archive --all-locations to not be always on

